Skip to content

Drafty draft - #1293

Draft
svchb wants to merge 355 commits into
mainfrom
drafty_draft
Draft

Drafty draft#1293
svchb wants to merge 355 commits into
mainfrom
drafty_draft

Conversation

@svchb
svchb marked this pull request as draft August 17, 2026 16:41
svchb added 23 commits August 17, 2026 18:49
# Conflicts:
#	NEWS.md
#	docs/src/systems/boundary.md
#	docs/src/systems/entropically_damped_sph.md
#	docs/src/systems/fluid.md
#	docs/src/systems/implicit_incompressible_sph.md
#	docs/src/systems/total_lagrangian_sph.md
#	docs/src/systems/weakly_compressible_sph.md
#	src/callbacks/mechanical_work_calculator.jl
#	src/callbacks/stepsize.jl
#	src/general/semidiscretization.jl
#	src/schemes/fluid/entropically_damped_sph/rhs.jl
#	src/schemes/fluid/surface_tension.jl
#	src/schemes/fluid/weakly_compressible_sph/rhs.jl
#	test/callbacks/stepsize.jl
#	test/general/custom_quantities.jl
#	test/schemes/fluid/calculate_dt.jl
# Conflicts:
#	src/general/corrections.jl
Fix conflicts in EDAC and WCSPH RHS:
- adopt mapreduce_neighbor / add_dv_* functional API from origin/main
- preserve gradient/force correction splitting from stack (gradient_correction for pressure/shifting, force_correction for free-surface)
# Conflicts:
#	src/schemes/fluid/entropically_damped_sph/rhs.jl
#	src/schemes/fluid/weakly_compressible_sph/rhs.jl
#	test/general/corrections/lifecycle.jl
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants